From a22225dc19b06186c39d9fc4312db010d33c7982 Mon Sep 17 00:00:00 2001 From: Alex Williamson Date: Mon, 30 Jul 2007 16:01:05 -0600 Subject: [PATCH] [IA64] Clean up unused pkrs[] handling. Signed-off-by: Dietmar Hahn --- xen/arch/ia64/xen/vcpu.c | 14 -------------- xen/include/public/arch-ia64.h | 3 +-- 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/xen/arch/ia64/xen/vcpu.c b/xen/arch/ia64/xen/vcpu.c index cf02a908aa..a250efef18 100644 --- a/xen/arch/ia64/xen/vcpu.c +++ b/xen/arch/ia64/xen/vcpu.c @@ -2057,28 +2057,14 @@ IA64FAULT vcpu_get_rr(VCPU * vcpu, u64 reg, u64 * pval) IA64FAULT vcpu_get_pkr(VCPU * vcpu, u64 reg, u64 * pval) { -#ifndef PKR_USE_FIXED printk("vcpu_get_pkr: called, not implemented yet\n"); return IA64_ILLOP_FAULT; -#else - u64 val = (u64) ia64_get_pkr(reg); - *pval = val; - return IA64_NO_FAULT; -#endif } IA64FAULT vcpu_set_pkr(VCPU * vcpu, u64 reg, u64 val) { -#ifndef PKR_USE_FIXED printk("vcpu_set_pkr: called, not implemented yet\n"); return IA64_ILLOP_FAULT; -#else -// if (reg >= NPKRS) -// return IA64_ILLOP_FAULT; - vcpu->pkrs[reg] = val; - ia64_set_pkr(reg, val); - return IA64_NO_FAULT; -#endif } /************************************************************************** diff --git a/xen/include/public/arch-ia64.h b/xen/include/public/arch-ia64.h index 50062d103a..b97008cf65 100644 --- a/xen/include/public/arch-ia64.h +++ b/xen/include/public/arch-ia64.h @@ -236,8 +236,7 @@ struct mapped_regs { int banknum; // 0 or 1, which virtual register bank is active unsigned long rrs[8]; // region registers unsigned long krs[8]; // kernel registers - unsigned long pkrs[8]; // protection key registers - unsigned long tmp[8]; // temp registers (e.g. for hyperprivops) + unsigned long tmp[16]; // temp registers (e.g. for hyperprivops) }; }; }; -- 2.30.2